From 50aec80efbbae45f9736dc07160e7e767188d542 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20Jard=C3=B3n?= Date: Tue, 17 Aug 2010 15:08:19 +0200 Subject: [PATCH] gtk/gtkdnd.c: Use accessor functions to access GtkWindow --- gtk/gtkdnd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 18281cd527..77f213135a 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -372,6 +372,7 @@ gtk_drag_get_ipc_widget (GtkWidget *widget) { GtkWidget *result; GtkWidget *toplevel; + GtkWindowGroup *group; result = gtk_drag_get_ipc_widget_for_screen (gtk_widget_get_screen (widget)); @@ -379,8 +380,9 @@ gtk_drag_get_ipc_widget (GtkWidget *widget) if (GTK_IS_WINDOW (toplevel)) { - if (GTK_WINDOW (toplevel)->group) - gtk_window_group_add_window (GTK_WINDOW (toplevel)->group, + group = gtk_window_get_group (GTK_WINDOW (toplevel)); + if (group) + gtk_window_group_add_window (group, GTK_WINDOW (result)); } @@ -545,6 +547,7 @@ static void gtk_drag_release_ipc_widget (GtkWidget *widget) { GtkWindow *window = GTK_WINDOW (widget); + GtkWindowGroup *group; GdkScreen *screen = gtk_widget_get_screen (widget); GdkDragContext *context = g_object_get_data (G_OBJECT (widget), "drag-context"); GSList *drag_widgets = g_object_get_data (G_OBJECT (screen), @@ -560,8 +563,9 @@ gtk_drag_release_ipc_widget (GtkWidget *widget) ungrab_dnd_keys (widget, keyboard, GDK_CURRENT_TIME); } - if (window->group) - gtk_window_group_remove_window (window->group, window); + group = gtk_window_get_group (window); + if (group) + gtk_window_group_remove_window (group, window); drag_widgets = g_slist_prepend (drag_widgets, widget); g_object_set_data (G_OBJECT (screen), I_("gtk-dnd-ipc-widgets"), -- 2.30.2